Some fixes.
Merge