Fixed bug that broke non-kernel NNs, added a TODO