LAST MINUTE FIXES