Fixes for defineShape()