small fixes
Merge remote-tracking branch 'origin/tal' into wes
Merge remote-tracking branch 'origin/wes' into tal