diff --git a/src/SmallSharp/SmallSharp.props b/src/SmallSharp/SmallSharp.props
index 2fad040..927055f 100644
--- a/src/SmallSharp/SmallSharp.props
+++ b/src/SmallSharp/SmallSharp.props
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <!-- This disables compilation error in VS for #: prefix -->
-    <Features Condition="'$(MSBuildIsRestoring)' != 'true'">$(Features);FileBasedProgram</Features>
+    <Features>$(Features);FileBasedProgram</Features>
 
     <!-- Capture project-level properties before they are defaulted by Microsoft.Common.targets -->
     <CustomBeforeMicrosoftCSharpTargets>$(MSBuildThisFileDirectory)\SmallSharp.Before.props</CustomBeforeMicrosoftCSharpTargets>
diff --git a/src/SmallSharp/SmallSharp.targets b/src/SmallSharp/SmallSharp.targets
index a5e5b11..82f5cdf 100644
--- a/src/SmallSharp/SmallSharp.targets
+++ b/src/SmallSharp/SmallSharp.targets
@@ -21,8 +21,8 @@
 
   <ItemGroup>
     <!-- Ensures all top-level files show up in the IDE -->
-    <None Include="*$(DefaultLanguageSourceExtension)" Exclude="$(ActiveDebugProfile);$(ActiveFile)" />
-    <Compile Remove="*$(DefaultLanguageSourceExtension)" />
+    <None Include="*.cs" Exclude="$(ActiveDebugProfile);$(ActiveFile)" />
+    <Compile Remove="*.cs" />
     <!-- Ensure changes we make to this file trigger a new DTB -->
     <UpToDateCheckBuilt Include="Properties\launchSettings.json" />
     <UpToDateCheckBuilt Include="$(SmallSharpPackagesProps);$(SmallSharpPackagesTargets)" />
@@ -47,7 +47,7 @@
 
   <Target Name="CollectStartupFile">
     <ItemGroup>
-      <StartupFile Include="*$(DefaultLanguageSourceExtension)" />
+      <StartupFile Include="*.cs" />
     </ItemGroup>
   </Target>