Scope and SIAf fixes