Does the latest upstream version of Aloha already address these issues? I'm worried these small changes in many of the common plugins will make it more difficult to pull upstream changes