A few more style tweaks