Fix several minor problems
Merge remote-tracking branch 'origin/master'