Fix some common errors