Fixed issues found in review