opera-related fixes
merge