last minute fixes