Fix form variables