minor fixes following recent enhancements