Backwards compatibility fixes with the Wub Machine.