A bouquet of some random fixes, improvements and removals