Address github annotations