A couple more style tweaks