Fixed some issues with poking