SUP-959 #comment Additional fixes after testing