George Hartzell's excellent code fixes