Update to 2.0
Little fixes on 2.0