Merge pull request #1032 from ey6es/master

Various fixes from Basecamp, etc.