More SUSE-related fixes

Tested fine locally; shouldn't impact Ubuntu.