SYS-fix-38a7.2: Small fixes and updates