Reviewed fixes