Centralised more protocol references, fixed upgrade script