Merge Issues fixes