Final few bugs