Some toxav fixes