Fixes and upgrade of autoform