Fixes from Colin