Making fixes per @j2sol's recommendations.