Fix Set-Extension Issues