A small handful of fixes