Fixes for Symphony 2.3.3