Expand and fix options