Fix two regressions that snuck in on #287