Some more fixes for the taskmanager migration