Fixes for Symphony 2.4 compatibility