Couple of general fixes