More shape fixes