Fix up minor bits and pieces