Speeeling fixes