Even moar improvements to stability, fixes