Portage 2.2 compatibility fixes