Fixes for Oscar 14