fix three minor polish issues with low-risk changes