fix core from 64bit fixes