Spoke misc fixes