Issue #592 Functional fixes