pre-Release 8 tweaks