Hi!

Thanks for the patches!

Pushed both to guix master, as commits 179be4bbe488d6c18d482da69b4997f7682d5a58
and 363989e6689068daeca81b442358b183b7d983d1, respectively.