Fix compile warnings after merging