Modifications for stability

cbryce