Merge minor fixes of 'master' branch into develop.
Quick fix
Some stupid minor fix...