Add *mut to a few more places