Fixes, fixes

I'm horrible at this.