Fixed some singleton inheritence.