Fixed some cores