Update some references so it's buildable