fix more small bugs
fix more small bugs

ffff-next/ffff-next,RedDog99/bielefeld,RedDog99/bielefeld,RedDog99/bielefeld,ffff-next/ffff-next,meskal/ffff-next,ffff-next/ffff-next,meskal/ffff-next,ffff-next/ffff-next,meskal/ffff-next