Minor general fixes