Fix some missing vars/overloads.