Latest fixes
Preparation rc1