Last Minute fixes.