Fixes from Roger