Fix thread/runtime crashes!