Fix last 2 commits