Fix a couple smaller issues