Merge fixes with latest master