Fixes around SSH keypairs and portability