Fixes and Update to 1.5.2