Expand fixes