some bng fixes