Fixes to be able to import it from a lantz script