Fixes to allow Debug to compile again