Big improvements in stability (yes I know, sucky commit message)