Updates for 0.11