Updates to support general GTS installation.