Code fixes for pareview