Fix bugs with basecamp integration