Added missing changes for multiarch support