Fixed minor things in my last changes