Remove two other unsafe usages