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