Mostly stablizing fixes.