Improvements in BOSH + MUC limits modules