More last minute fixes