Fix some typos
Change first/second annotations to handle map entries