fix merge
Minor fixes