Fix compatibility issues with lalopmak