Fix up core install