David Bremner committed some fixes.