Polish some things up