Fixes to next best view