Add some style fixes