Fix compilation errors
checkin to find bug
WIP to locate bug
Merge branch 'master' of github.com:cambridgehackers/xbsv