Fix the vaddr translation. Misc fixes