Make it compatible with Symphony 2.3

This commit fixes some compatibility issues with Symphony 2.3 and up.