fixes and 5.2 update