Ports some lag spike fixes
Merge pull request #964 from ike709/master

Ports some lag spike fixes