Hotfixes for API and english language handlers