making some changes so that verify passes in bluesim

Change-Id: If3875fb3d57c8fe7507f37b1ef2ba008c7491dda
Merge branch 'master' of git://github.com/cambridgehackers/xbsv