Various boot cleanups - nothing radical