Fix up a few things

Damn