Minor fixes, remove debugging