Assorted style tweaks