Fixed things missing from the previous commit