Merge fixes into master