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