Some more cmake fixes required for installation