Fix missing SW3 & 4 definitions