Fix up minor issues