LAst minute bugs