Minor fixes after Qt 5.0 work.