Update to fix subsetting, fixes for ExternalTool modifications.