Some minor changes last last