Fixed some things in the grab machine