Final fixes for tonight