Fixes to Qt 5.2