Bunch of fixes to V1