Fixes for Qt5.3 and Windows