Better handling of supported architectures.