A couple of suggested fixes