Polish some things out