Fixed some errors from last commit