Fixed the addToActive form on the gts and other minor fixes