Some corrections

+ up to date with latest from upstream