Updated and fixed dep on core