more fixes for Version2