Fixes to Substitute System