Correction build broken by subtree merge
Correction tabs in spaces
Resolve build errors introduced by #350