Fix common errors, fix #5