Mixed minor fixes