Fixed things up