FUSETOOLS-1084 - updates to ensure functionality