more sqlalchemy-0.4 changes