Some minor changes for forms