Fix two bugs (missed porting to new class names / namespaces), thanks SensiolabsInsight