Restoring some stuff for build purposes, I should... Clean this up in the future