Fixes for getting non xoauth channels working again