Added some changes I forgot