Fixes for Symphony 2.5