chore: Take care of some nits