Small fixes and initial qmake support