Minor work on main