SUP-959 #comment Fixes after testing