OSX and QT enhancements