More mistakes fixed