Fix some nits?