Fix more cases of separate commits that should go together
Fix more cases of separate commits that should go together

mancoast/cado-nfs,mancoast/cado-nfs,mancoast/cado-nfs,mancoast/cado-nfs,mancoast/cado-nfs,mancoast/cado-nfs,mancoast/cado-nfs