Fix some issues after merging