Some fixes in form and autoloader