more BS3 and FA4 conversion fixes