Fix up things suggested in Code Review