Last fixes for tonight