needed more fixes for reboot-loop (I'm blind)