Fixes and updates round 593