Small edits to fix merge issues.