Some Opus related changes