Fixing XD_HOME settings