Some changes for 0.12.
Some changes for 0.12.