Fix forms for both BS2 and BS3