Final handful of fixes for tonight