More resolve fix + better lastplay