merge fixes for @ebidel and @kig