Fixes for changes to common