Lot 'o bugs for Thomas to fix.