Expand related fixes