Fixes to bitrot