Fix melange imports