fixed Zafira integration issues