Changes to hake.c, mostly compile issues
Merged