master cmake change to fix some bugs