Robinfixes

Merge of fixes of existing open issues.