Basic source fixes

These are needed in order to do a successful compile of zImage