Fixes in cmake