Ports some lag spike fixes