Add more Waila compat