minor changes to fix merge