Several fixes
Merge Master