Fixing up a couple more missed classes that were moved.