Multiple fixes on style