Bugfixes for Symphony 2.33