Fixed things up a little