Some fixes to work with the current NixOS again