tweaks for d7