A bunch of changes for d7