Hotfix 0.24.x code improvements