Fixed a couple of classes, because they weren't public