A few form additions/fixes.