bugfixes publish later

These changes can also be merged with 2.2 branch