Small bug fixes in new child form.