Fix some issues with startup