Fix various import errors related to James' removal of bottle from the repository