Fix common errors