Various bugfixes/updates from QA on Basecamp.