Extension fixes & NuGet Updates