SYS-fix-39a7.12: Small fixes and updates