#3184 fixes after tests