Merge fixes and feature comparison fixes