Some fixes for annoying things on startup