Minor fixes for Symphony 2.5+ compatibility