GT-862 fixes