Modified export for Raspberry Pi + fix