Updated to latest xctool with environment.