Fixes on general styles