Changes made following Gentoo tests