Updates to latest core