more stableness fixes