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