Fixes from David.