several bug fixes for hotfix 3