Patches for Merchello.com build