Some more style issues