fix small problems
Merge branch 'dev' into oldCompatible