Fix user-env-compile support