Update 2.0 to 2.1

First edit is tested, not sure how to verify second. (+ @peterneubauer )