Final set of style conformity changes