Fix many minor errors found after wiping controller node and starting over.