Misc changes for elasticity