Fixed issues found with pareview