Fixed some common mistakes