Fixes some of the issues where debugging code was pushed up