Make some small changes to clean up.