2.19 minor fixes