Fix misc. style issues