wking's suggested fixes