Making fixes per @smashwilson's recommendations.