Additional cleanup, fix debug builds.