Fix some nits