Minor changes to form and load handling.