LAB limit fixes

Work in progress…