Hopefully the final bugfix cleanup before merge.