fixes for enhancements 972, 973, 1084