[FIX] Removing some problems introduced by the core/extras merging.