compile fixes
Misc
misc