Update oa_core.make to latest versions