Fix options definitions
Respect <only_for_archs> when building PBIs