Minor bug fixes dealing with startup