diff --git a/src/Umbraco.Core/Persistence/Repositories/IDataTypeContainerRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IDataTypeContainerRepository.cs
index 460bed71d3..57d3871e5a 100644
--- a/src/Umbraco.Core/Persistence/Repositories/IDataTypeContainerRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IDataTypeContainerRepository.cs
@@ -1,5 +1,5 @@
 namespace Umbraco.Core.Persistence.Repositories
 {
-    interface IDataTypeContainerRepository : IEntityContainerRepository
+    public interface IDataTypeContainerRepository : IEntityContainerRepository
     { }
 }
diff --git a/src/Umbraco.Core/Persistence/Repositories/IDocumentTypeContainerRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IDocumentTypeContainerRepository.cs
index ccf8df268d..ec8dfb9110 100644
--- a/src/Umbraco.Core/Persistence/Repositories/IDocumentTypeContainerRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IDocumentTypeContainerRepository.cs
@@ -1,5 +1,5 @@
 namespace Umbraco.Core.Persistence.Repositories
 {
-    interface IDocumentTypeContainerRepository : IEntityContainerRepository
+    public interface IDocumentTypeContainerRepository : IEntityContainerRepository
     { }
 }
diff --git a/src/Umbraco.Core/Persistence/Repositories/IEntityContainerRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IEntityContainerRepository.cs
index 47f0cee52b..f1c8353a0d 100644
--- a/src/Umbraco.Core/Persistence/Repositories/IEntityContainerRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IEntityContainerRepository.cs
@@ -2,6 +2,6 @@
 
 namespace Umbraco.Core.Persistence.Repositories
 {
-    interface IEntityContainerRepository : IReadRepository<int, EntityContainer>, IWriteRepository<EntityContainer>
+    public interface IEntityContainerRepository : IReadRepository<int, EntityContainer>, IWriteRepository<EntityContainer>
     { }
 }
diff --git a/src/Umbraco.Core/Persistence/Repositories/IMacroRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IMacroRepository.cs
index eefb48933e..1ed08352ed 100644
--- a/src/Umbraco.Core/Persistence/Repositories/IMacroRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IMacroRepository.cs
@@ -3,7 +3,7 @@ using Umbraco.Core.Models;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
-    internal interface IMacroRepository : IReadWriteQueryRepository<int, IMacro>, IReadRepository<Guid, IMacro>
+    public interface IMacroRepository : IReadWriteQueryRepository<int, IMacro>, IReadRepository<Guid, IMacro>
     {
 
         //IEnumerable<IMacro> GetAll(params string[] aliases);
diff --git a/src/Umbraco.Core/Persistence/Repositories/IMediaTypeContainerRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IMediaTypeContainerRepository.cs
index a1872df0cd..6a133c053a 100644
--- a/src/Umbraco.Core/Persistence/Repositories/IMediaTypeContainerRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IMediaTypeContainerRepository.cs
@@ -1,5 +1,5 @@
 namespace Umbraco.Core.Persistence.Repositories
 {
-    interface IMediaTypeContainerRepository : IEntityContainerRepository
+    public interface IMediaTypeContainerRepository : IEntityContainerRepository
     { }
 }
diff --git a/src/Umbraco.Core/Services/Changes/ContentTypeChange.cs b/src/Umbraco.Core/Services/Changes/ContentTypeChange.cs
index d67f8f9200..57e1d288e4 100644
--- a/src/Umbraco.Core/Services/Changes/ContentTypeChange.cs
+++ b/src/Umbraco.Core/Services/Changes/ContentTypeChange.cs
@@ -4,7 +4,7 @@ using Umbraco.Core.Models;
 
 namespace Umbraco.Core.Services.Changes
 {
-    internal class ContentTypeChange<TItem>
+    public class ContentTypeChange<TItem>
         where TItem : class, IContentTypeComposition
     {
         public ContentTypeChange(TItem item, ContentTypeChangeTypes changeTypes)
diff --git a/src/Umbraco.Core/Services/Implement/ContentTypeService.cs b/src/Umbraco.Core/Services/Implement/ContentTypeService.cs
index f6498770ec..fa818496ff 100644
--- a/src/Umbraco.Core/Services/Implement/ContentTypeService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentTypeService.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Core.Services.Implement
     /// <summary>
     /// Represents the ContentType Service, which is an easy access to operations involving <see cref="IContentType"/>
     /// </summary>
-    internal class ContentTypeService : ContentTypeServiceBase<IContentTypeRepository, IContentType, IContentTypeService>, IContentTypeService
+    public class ContentTypeService : ContentTypeServiceBase<IContentTypeRepository, IContentType, IContentTypeService>, IContentTypeService
     {
         public ContentTypeService(IScopeProvider provider, ILogger logger, IEventMessagesFactory eventMessagesFactory, IContentService contentService,
             IContentTypeRepository repository, IAuditRepository auditRepository, IDocumentTypeContainerRepository entityContainerRepository, IEntityRepository entityRepository)
diff --git a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBase.cs b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBase.cs
index d5cdd36318..26298f171c 100644
--- a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBase.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBase.cs
@@ -4,7 +4,7 @@ using Umbraco.Core.Scoping;
 
 namespace Umbraco.Core.Services.Implement
 {
-    internal abstract class ContentTypeServiceBase : ScopeRepositoryService
+    public abstract class ContentTypeServiceBase : ScopeRepositoryService
     {
         protected ContentTypeServiceBase(IScopeProvider provider, ILogger logger, IEventMessagesFactory eventMessagesFactory)
             : base(provider, logger, eventMessagesFactory)
diff --git a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTItemTService.cs b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTItemTService.cs
index 33fb9a0894..f4457e0991 100644
--- a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTItemTService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTItemTService.cs
@@ -6,7 +6,7 @@ using Umbraco.Core.Services.Changes;
 
 namespace Umbraco.Core.Services.Implement
 {
-    internal abstract class ContentTypeServiceBase<TItem, TService> : ContentTypeServiceBase
+    public abstract class ContentTypeServiceBase<TItem, TService> : ContentTypeServiceBase
         where TItem : class, IContentTypeComposition
         where TService : class, IContentTypeServiceBase<TItem>
     {
diff --git a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
index be4f719bb1..8189c6524e 100644
--- a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
@@ -13,7 +13,7 @@ using Umbraco.Core.Services.Changes;
 
 namespace Umbraco.Core.Services.Implement
 {
-    internal abstract class ContentTypeServiceBase<TRepository, TItem, TService> : ContentTypeServiceBase<TItem, TService>, IContentTypeServiceBase<TItem>
+    public abstract class ContentTypeServiceBase<TRepository, TItem, TService> : ContentTypeServiceBase<TItem, TService>, IContentTypeServiceBase<TItem>
         where TRepository : IContentTypeRepositoryBase<TItem>
         where TItem : class, IContentTypeComposition
         where TService : class, IContentTypeServiceBase<TItem>
diff --git a/src/Umbraco.Core/Services/Implement/DataTypeService.cs b/src/Umbraco.Core/Services/Implement/DataTypeService.cs
index 79ca851de9..84d44649da 100644
--- a/src/Umbraco.Core/Services/Implement/DataTypeService.cs
+++ b/src/Umbraco.Core/Services/Implement/DataTypeService.cs
@@ -16,7 +16,7 @@ namespace Umbraco.Core.Services.Implement
     /// <summary>
     /// Represents the DataType Service, which is an easy access to operations involving <see cref="IDataType"/>
     /// </summary>
-    internal class DataTypeService : ScopeRepositoryService, IDataTypeService
+    public class DataTypeService : ScopeRepositoryService, IDataTypeService
     {
         private readonly IDataTypeRepository _dataTypeRepository;
         private readonly IDataTypeContainerRepository _dataTypeContainerRepository;
diff --git a/src/Umbraco.Core/Services/Implement/MacroService.cs b/src/Umbraco.Core/Services/Implement/MacroService.cs
index 5176e2eb22..d4f2d95bbb 100644
--- a/src/Umbraco.Core/Services/Implement/MacroService.cs
+++ b/src/Umbraco.Core/Services/Implement/MacroService.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Core.Services.Implement
     /// <summary>
     /// Represents the Macro Service, which is an easy access to operations involving <see cref="IMacro"/>
     /// </summary>
-    internal class MacroService : ScopeRepositoryService, IMacroService
+    public class MacroService : ScopeRepositoryService, IMacroService
     {
         private readonly IMacroRepository _macroRepository;
         private readonly IAuditRepository _auditRepository;
diff --git a/src/Umbraco.Core/Services/Implement/MediaTypeService.cs b/src/Umbraco.Core/Services/Implement/MediaTypeService.cs
index fe8c78e137..8cb69a655d 100644
--- a/src/Umbraco.Core/Services/Implement/MediaTypeService.cs
+++ b/src/Umbraco.Core/Services/Implement/MediaTypeService.cs
@@ -8,7 +8,7 @@ using Umbraco.Core.Scoping;
 
 namespace Umbraco.Core.Services.Implement
 {
-    internal class MediaTypeService : ContentTypeServiceBase<IMediaTypeRepository, IMediaType, IMediaTypeService>, IMediaTypeService
+    public class MediaTypeService : ContentTypeServiceBase<IMediaTypeRepository, IMediaType, IMediaTypeService>, IMediaTypeService
     {
         public MediaTypeService(IScopeProvider provider, ILogger logger, IEventMessagesFactory eventMessagesFactory, IMediaService mediaService,
             IMediaTypeRepository mediaTypeRepository, IAuditRepository auditRepository, IMediaTypeContainerRepository entityContainerRepository,
diff --git a/src/Umbraco.Core/Services/Implement/MemberTypeService.cs b/src/Umbraco.Core/Services/Implement/MemberTypeService.cs
index 6cc7d03cfb..05f32dc99c 100644
--- a/src/Umbraco.Core/Services/Implement/MemberTypeService.cs
+++ b/src/Umbraco.Core/Services/Implement/MemberTypeService.cs
@@ -8,7 +8,7 @@ using Umbraco.Core.Scoping;
 
 namespace Umbraco.Core.Services.Implement
 {
-    internal class MemberTypeService : ContentTypeServiceBase<IMemberTypeRepository, IMemberType, IMemberTypeService>, IMemberTypeService
+    public class MemberTypeService : ContentTypeServiceBase<IMemberTypeRepository, IMemberType, IMemberTypeService>, IMemberTypeService
     {
         private readonly IMemberTypeRepository _memberTypeRepository;
 
diff --git a/src/Umbraco.Web/Models/PublishedContent/HttpContextVariationContextAccessor.cs b/src/Umbraco.Web/Models/PublishedContent/HttpContextVariationContextAccessor.cs
index 70672e3796..0007b346c5 100644
--- a/src/Umbraco.Web/Models/PublishedContent/HttpContextVariationContextAccessor.cs
+++ b/src/Umbraco.Web/Models/PublishedContent/HttpContextVariationContextAccessor.cs
@@ -21,7 +21,7 @@ namespace Umbraco.Web.Models.PublishedContent
         /// <inheritdoc />
         public VariationContext VariationContext
         {
-            get => (VariationContext) HttpContextAccessor.HttpContext.Items[ContextKey];
+            get => (VariationContext) HttpContextAccessor.HttpContext?.Items[ContextKey];
             set => HttpContextAccessor.HttpContext.Items[ContextKey] = value;
         }
     }