Fixed a couple of regressions