Fixed two regressions