Latest fixes from work.