Fixed some bugs with the last commit