Undid TLB junk, fixed some compile complaints