Updates for 0.12-0.13