Fixes for ez-ipupdate, stored here until I can find upstream