Style fixes for Symphony 2.4