Merge reviewed fixes