More fixes, this time for system startup.