BUG: fixed more helper imports