Fix $ handling of root objects as context