diff --git a/src/sys/ubixfsv2/ubixfs.cpp b/src/sys/ubixfsv2/ubixfs.cpp
index e44f21e..17118e8 100644
--- a/src/sys/ubixfsv2/ubixfs.cpp
+++ b/src/sys/ubixfsv2/ubixfs.cpp
@@ -162,18 +162,19 @@
   ubixfsInode * inode = NULL;
 
   inode = new ubixfsInode;
-  memset(inode, 0, sizeof(ubixfsInode));
   if (inode == NULL) return NULL;
+  memset(inode, 0, sizeof(ubixfsInode));
+
   // inode->magic1 = ;
   if (parent == NULL)
-    inode->inodeNum = getFreeBlock(parent->inodeNum.allocationGroup);
-  else
     inode->inodeNum = getFreeBlock();
+  else
+    inode->inodeNum = getFreeBlock(parent->inodeNum.allocationGroup);
 
   strncpy(inode->name, filename, MAX_FILENAME_LENGTH);
 
-  // inode->uid
-  // inode->gid
+  inode->uid = getuid();
+  inode->gid = getgid();
   // inode->mode
   // inode->flags
   // inode->createTime
diff --git a/src/sys/ubixfsv2/ubixfs.h b/src/sys/ubixfsv2/ubixfs.h
index eb58ab1..51abdbb 100644
--- a/src/sys/ubixfsv2/ubixfs.h
+++ b/src/sys/ubixfsv2/ubixfs.h
@@ -1,8 +1,9 @@
 #ifndef UBIXFS_H
 #define UBIXFS_H
 
-#include "fsAbstract.h"
 #include <sys/types.h>
+#include <unistd.h>
+#include "fsAbstract.h"
 
 typedef struct blockRun {
   int            allocationGroup  __attribute__ ((packed));
@@ -74,12 +75,12 @@
 
 typedef struct dataStream {
   struct blockRun direct[NUM_DIRECT_BLOCKS];
-  off_t    maxDirectRange;
+  off_t           maxDirectRange;
   struct blockRun indirect;
-  off_t    maxIndirectRange;
+  off_t           maxIndirectRange;
   struct blockRun double_indirect;
-  off_t    maxDoubleIndirectRange;
-  off_t    size;
+  off_t           maxDoubleIndirectRange;
+  off_t           size;
 } dataStream;
 
 struct ubixfsInode;
@@ -96,8 +97,8 @@
   int32       magic1        __attribute__ ((packed));
   inodeAddr   inodeNum      __attribute__ ((packed));
   char        name[MAX_FILENAME_LENGTH]  __attribute__ ((packed));
-  int32       uid           __attribute__ ((packed));
-  int32       gid           __attribute__ ((packed));
+  uid_t       uid           __attribute__ ((packed));
+  gid_t       gid           __attribute__ ((packed));
   int32       mode          __attribute__ ((packed));
   int32       flags         __attribute__ ((packed));
  // uInt64      createTime    __attribute_ ((packed));