just some fixes against crashing on server start