Fixes from Opencart Master

Fixes from Opencart Master