Last mistakes fixed