Fixed crashes (and sped-up runtimes at the same time)