More bug fixes - didn't include ore measure
Merge remote-tracking branch 'origin/master'