Fixed nits from jezdez's comments.