Fixes for Qt 5.2