A few tiny hacks to make it build as-is...