fix some warnings / remove TABs
Merge branch 'v3-source' into v3