More manifest tweaks