Begin working on 0.27 fixes