fixes for LB