Fixing references to common and thrust packages