Summary of changes: 34eb55d... Small fixes after moving to weld-parent 31 (*) ab44419... Another set of fixes (*) (*) This commit already existed in another branch; no separate mail sent