Fixed speed issues