Fix Core, follow slim for now, r1.2 update effects code