Platform-specific manifest overrides. Work in progress

Test fixes