Stability fixes

About 10 bazillion times less likely to crash