Fix issues.
Merge branch 'robert'