A couple classes snuck through last commit