Some unstaged fixes from time before dinosaurs walked the earth