Issue #274 Fixes from sendhil