A couple of fixes

Tasty opera! : )