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