Hyperwall related changes.