A few changes to ensure everything can start correctly