Some more updates for cmake