Fix unapplied changes from 2 last commit

Yehawww