Fixed last 2 commits

(hopefully)