Various changes for stability