Fixes from Kate's list