small fixes, should run without crash