FIX: bugs found in different environment

Really, I have no idea why this worked before. I’m not sure it should
have…