Fix some lag issues