Hack fixes after Opera testing