Basecamp fixes