Severa minor fixes (see commits)

line not used