more updates for arch compat