Tentatively fix manifest problems