Actual fixes

Wow that was dumb