Old todo
Fixes borrowed from 2.1-beta