Fix lag issues