Adding changes for pre-A3 vm to work.