Modifications for Arch compatibility