Resolve issues from testing and code review