Shape example fixes