Fix bit rot from NetCore development

This is an attempt to fix the incompatibility with fattire and the current version of NetCore.