Fixed classes and headers