Minor updates all around, removing some bit rot