Fix issues wrt recent refactoring of databind