Define property fixes

Fixes #2 (again).