Polish a few things