fixes for 5989