PFS B2 and B3 equipment fixes