Minor fixes
Removed debugging