Debug build fixes.