Fixing more dynamic forms related stuff.