Minor changes from local
Merge branch 'tmp'