Patch up classes