Add two small fixes for system arch support.