Resolve some local differences