Final few fixes for today