small fixes
Merge branch 'sean'