More initial speed fixes