fixes for arch and newer versions