Various fixes from Basecamp, etc.