Simplify path sanity check, fix another view related bug