Adding minor stuff to help with debugging