Fixes to style duplication