Styles fixes

This is to ensure bugs #308 and #326 are addressed.