Some more fixes, remove debug