Issue #67, Issue #64 - Attribute editing issues