Better handling of unusual extensions