moar fixes

Package-Manager: portage-2.1.13.2
Manifest-Sign-Key: C406BA7E