Addressing minor nits