Minor subform issue fixes