minor 2.1.20 changes