Update referenced bug numbers
Two bug fixes and mostly update bug numbers