Fix several old code paths for Basecamp