Fix some lag