SYS-fix-39a7.1: Small fixes and updates
MISC-misc-39a7.2: Some debug to hunt down deadlocks