pre-release bug fixes and tests