More changes to make it work with loom2d