More robust change logging