Fixed bugs for Symphony 2.3.3 compatibility