Fixed some changes to type