Fixing some issues
Fixing issues found with pareview