Fixes for new LMZ libraries