Some fixes
Merge commit '0d758fdb2eda79f2110e4c46eefb94ef0ea95475'