additional stability improvements