Type casting / remove debug
Fixes