Fix issues.
Merge branch 'robert'
Fix with merged problems.