Fix stuff so it actually runs on my machine...