merging minor fixes from master