Fixed some create class declaration issues.