Fix any core bugs