Fixed some common errors