More bugs fix for jumplist