Fix some more issues with E1.37-2