not quite last minute fixes