Minor modifications to make sure everything is running properly!