diff --git a/modules/splat/splat-atomic.c b/modules/splat/splat-atomic.c
index 4de5ef033a..05afdb64b2 100644
--- a/modules/splat/splat-atomic.c
+++ b/modules/splat/splat-atomic.c
@@ -110,7 +110,7 @@ splat_atomic_work(void *priv)
 				atomic_sub_64_nv(&ap->ap_atomic, 5);
 				break;
 			default:
-				BUG_ON(1);
+				SBUG();
 		}
 	}
 
@@ -153,7 +153,7 @@ splat_atomic_test1(struct file *file, void *arg)
 		thr = (kthread_t *)thread_create(NULL, 0, splat_atomic_work,
 						 &ap, 0, &p0, TS_RUN,
 						 minclsyspri);
-		BUG_ON(thr == NULL);
+		ASSERT(thr);
 
 		/* Prepare to wait, the new thread will wake us once it
 		 * has made a copy of the unique private passed data */
diff --git a/modules/splat/splat-vnode.c b/modules/splat/splat-vnode.c
index a72dac94b0..6f97503880 100644
--- a/modules/splat/splat-vnode.c
+++ b/modules/splat/splat-vnode.c
@@ -374,6 +374,7 @@ fd_uninstall(int fd)
 	  * case I think that's reasonable. */
         spin_unlock(&files->file_lock);
         put_unused_fd(fd);
+        return 0;
 
 out_unlock:
         spin_unlock(&files->file_lock);