Bug fixes in kernel defines.  Compiles in user space; needs testing in kernel space