Fix build errors for previous submit.  Runtime error present