More changes for gentoo compat