Further general fixes