Some initial past_form fixes