Fixing core build