Start on fixes for LVish 2.0