Some additional tiny changes.