Fixes client-side vanilla bugs

Purpur suggestions that should be a plugin