Fix NeuralNetworkBuilder problems