Fix various evaluation problems

http://hydra.nixos.org/build/13616685