Fixed some errors from my last Commit