Fix some docblock comments and namespace imports