Fix-ups