Merge from Development

Small but important fixes.