Fix bugs caused by speeding up