Fixes from Alex.