Fixes to work with custom graphics
Removed debug thing