Misc fixes, better Expand.