orm fixes #2