Mistakes fixed