Stability improvements

This hotfix includes multiple issue corrections.