Fixes and Cherry 3.1.3 updates