Repush to 2.1.1 with compatibility and bug fixes