Fix regressions caused by #194. Thank you, integrated testing!