Small convenience fixes