Fix speed issues