Fixes from Anne