VERSION handling fixes