This PR polishes trivial stuff.