diff --git a/src/add-ons/kernel/file_systems/ntfs/attributes.c b/src/add-ons/kernel/file_systems/ntfs/attributes.c
index 727b6d6960..0e10eba511 100644
--- a/src/add-ons/kernel/file_systems/ntfs/attributes.c
+++ b/src/add-ons/kernel/file_systems/ntfs/attributes.c
@@ -422,8 +422,7 @@ exit:
 status_t
 fs_close_attrib(fs_volume *_vol, fs_vnode *_node, void *cookie)
 {
-	vnode *node = (vnode*)_node->private_node;
-	TRACE("%s vnid: %d\n", __FUNCTION__, node->vnid);
+	TRACE("%s vnid: %d\n", __FUNCTION__, ((vnode*)_node->private_node)->vnid);
 	return B_NO_ERROR;
 }
 
diff --git a/src/add-ons/kernel/file_systems/ntfs/fs_func.c b/src/add-ons/kernel/file_systems/ntfs/fs_func.c
index 2c948d0250..82188287ad 100644
--- a/src/add-ons/kernel/file_systems/ntfs/fs_func.c
+++ b/src/add-ons/kernel/file_systems/ntfs/fs_func.c
@@ -1126,11 +1126,11 @@ exit:
 
 
 status_t
-fs_read(fs_volume *_vol, fs_vnode *_dir, void *_cookie, off_t offset, void *buf,
+fs_read(fs_volume *_vol, fs_vnode *_node, void *_cookie, off_t offset, void *buf,
 	size_t *len)
 {
 	nspace *ns = (nspace*)_vol->private_volume;
-	vnode *node = (vnode*)_dir->private_node;
+	vnode *node = (vnode*)_node->private_node;
 	ntfs_inode *ni = NULL;
 	ntfs_attr *na = NULL;
 	size_t  size = *len;
@@ -1206,11 +1206,11 @@ exit2:
 
 
 status_t
-fs_write(fs_volume *_vol, fs_vnode *_dir, void *_cookie, off_t offset,
+fs_write(fs_volume *_vol, fs_vnode *_node, void *_cookie, off_t offset,
 	const void *buf, size_t *len)
 {
 	nspace *ns = (nspace*)_vol->private_volume;
-	vnode *node = (vnode*)_dir->private_node;
+	vnode *node = (vnode*)_node->private_node;
 	filecookie *cookie = (filecookie*)_cookie;
 	ntfs_inode *ni = NULL;
 	ntfs_attr *na = NULL;
@@ -1264,7 +1264,7 @@ fs_write(fs_volume *_vol, fs_vnode *_dir, void *_cookie, off_t offset,
 		if (ntfs_attr_truncate(na, offset + size))
 			size = na->data_size - offset;
 		else
-			notify_stat_changed(ns->id, MREF(ni->mft_no), B_STAT_SIZE);
+			notify_stat_changed(ns->id, node->vnid, B_STAT_SIZE);
 	}
 
 	while (size) {
diff --git a/src/add-ons/kernel/file_systems/ntfs/ntfsdir.c b/src/add-ons/kernel/file_systems/ntfs/ntfsdir.c
index 46f5e0f1a9..36a1aacea5 100644
--- a/src/add-ons/kernel/file_systems/ntfs/ntfsdir.c
+++ b/src/add-ons/kernel/file_systems/ntfs/ntfsdir.c
@@ -92,9 +92,9 @@ fs_free_dircookie(fs_volume *_vol, fs_vnode *vnode, void *_cookie)
 	
 	if (cookie != NULL) {
 		cache_entry *entry = cookie->cache_root;
-		for(;entry!=NULL;) {
+		while (entry != NULL) {
 			cache_entry *next = entry->next;
-			if(entry->ent != NULL)
+			if (entry->ent != NULL)
 				free(entry->ent);
 			free(entry);
 			entry = next;
@@ -176,7 +176,7 @@ fs_readdir(fs_volume *_vol, fs_vnode *_node, void *_cookie, struct dirent *buf,
 	LOCK_VOL(ns);
 	TRACE("fs_readdir - ENTER (sizeof(buf)=%d, bufsize=%d, num=%d\n",
 		sizeof(buf), bufsize, *num);
-
+		
 	if (!ns || !node || !cookie || !num || bufsize < sizeof(*buf)) {
 	 	result = EINVAL;
 		goto exit;
@@ -241,7 +241,7 @@ exit:
 
 
 status_t
-fs_rewinddir(fs_volume *_vol, fs_vnode *vnode, void *_cookie)
+fs_rewinddir(fs_volume *_vol, fs_vnode *_node, void *_cookie)
 {
 	nspace		*ns = (nspace*)_vol->private_volume;
 	dircookie	*cookie = (dircookie*)_cookie;
@@ -252,9 +252,9 @@ fs_rewinddir(fs_volume *_vol, fs_vnode *vnode, void *_cookie)
 	
 	if (cookie != NULL) {
 		cache_entry *entry = cookie->cache_root;
-		for(;entry!=NULL;) {
+		while (entry != NULL) {
 			cache_entry *next = entry->next;
-			if(entry->ent != NULL)
+			if (entry->ent != NULL)
 				free(entry->ent);
 			free(entry);
 			entry = next;