Merge fixes to release