Speed fixes