Minor imprivement to patterns and logging