Fix a couple of silly compile errors (from bad merges)