Fixed things on main