Eurich various fixes

Merged in master to resolve conflicts. (Maybe a rebase was more clean...dunno.)