Qt4.7 support: More fixes