Fixed some issues from CodeAnalysis.