Stopgap update of Core