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