Fixed more warning-errors.  Prep for kmalloc