Minor fixes in cmake files