Trivial changes to acthieve Gentoo support