ba fixes