Fixed issues from Emily.