Make numberlib and formhelper work again