Merge PR#66: VM bootstraping improvements