Fix stuff so it actually works now