Add 2 new UDFs, fix build.