Merger my master back to LLI/master

Merge some minor changes.