Some changes to the cmake file