Added fixes for notx constructor and orx class name