Fix peek and poke