Fixed issues from G