Fixed some bugs I introduced in last 2 commits