Some regression fixes
Merge branch 'trikSupportStage2' of github.com:qreal/qreal into trikSupportStage2