diff --git a/userprog/syscall.c b/userprog/syscall.c
index 0773f823a3e5ccab298322ca3a98688228211060..4580d7f63c71fef0752f3ad387e8599bfb218f57 100644
--- a/userprog/syscall.c
+++ b/userprog/syscall.c
@@ -59,8 +59,8 @@ syscall_handler (struct intr_frame *f UNUSED)
     syscall_halt(f);
     break;
   case SYSCALL_EXIT:
-	  syscall_exit(f);
-	  break;
+	syscall_exit(f);
+	break;
   case SYSCALL_CREATE:
     syscall_create(f);
     break;
diff --git a/userprog/syscall_open.c b/userprog/syscall_open.c
index 783c561f5c0529c95ae606a3a5e8371a5306b4d2..d775581dbcc564382ab2dc412b28e22e30f9a944 100644
--- a/userprog/syscall_open.c
+++ b/userprog/syscall_open.c
@@ -8,14 +8,15 @@
 
 #include "system_calls.h"
 #include "threads/interrupt.h" // Dependency for intr_frame struct
-#include "filesys/file.h" // Dependency for file_open and file struct
+#include "filesys/file.h" // Dependency for file struct
+#include "filesys/filesys.h" // Dependency for filesys_open
 
 void syscall_open(struct intr_frame *f) {
 	//struct file_map f_map; // Create f_map struct instance
 	// pop off first int argument from interrupt frame
 	char* file_name = (void*)(*(int*)f->esp + 1);
 	// Described in system_calls.h, opens the file
-	struct file *file = file_open(file_name);
+	struct file *file = filesys_open(file_name);
 	if (file == NULL) { // Checking if file is empty or non-existent
 		f->eax = -1; // Returning a failure state
 		return;