some fixes for 7951299