Correcting bugs on Walker