Fix bugs with previous commit. Or, Lloyd is bad at reviews