Squashed debug commits