Fixed issues after Jason's comments