Fixes + Symphony 2.4