Bug fixes

What did you do, Davis?