Minor cmake config changes