Fix incorrect usage of a couple of classes