Configuration and manifest tweaks