fixes after comments https://bugs.gentoo.org/show_bug.cgi?id=513158