minor stability improvements
fixes