Tada, more fixes for LB