BUGFIXes to v1r1

to be tagged same as v1r1, if possible