LB-933: some fixes