123317 qa3 fixes

@mwhite 

Probably easiest to review each commit individually.