bugfixes for ee-orm