Some minor updates for stability