Corrections due to merge