Fixed a few issues that turned up with running on neutrino.