cmake fixes from Giulio