Fixes / improvements we made for inclusion in the VIP Shared Plugins repo

Feel free to hit me with any questions you might have about my commits.