Fixed speed related issues