Fixes for ARM architecture
Fix compile for ESA/390 mainframe