Gurtej stable release 3 fixes

Several fixes, resolving tickets #415, #453, #472.