Fix some issues while merging