Minimal changes to common