Fixes for DNN class