Fix some import and namespace errors.
2 + 2 = 4