last minute fixes.