Fixes has_shape remaining bugs