Applied recent changes in toxav
Random small changes
Apparently these got changed too