Trying to fix up build errors
Merge branch 'NewFromScratch' into test