Additional updates for 0.7.0-pre