This got a bit messy and will be further fixed when all related packets are updated. (Also fixed a typo in atoll msvc macro)