Inner classes and embed fix