minor fixes
Merge from development