Last Minute bugs