Fixes from Ben