WIP: fixing some bitrot