A few updates for 0.12