Adapt to latest FunnyQT changes