Fix speed issues, hopefully