Misc changes
Fix debug build