debug build fixes