Bug fixes from Ben