Updated some missed items with switch to classmap.