Add to `compat`? We should probably use this for the GUI as well.