Fixed some bugs from the last commit