Fixes/refs 8601 - missing bits