Resolve type errors for annotation API mostly