Fix some multiarch and console-setup issues