Domain issue with buddypress on a subsite

I love this plugin so far but am having a couple of minor issues.

I have my multisite set up on my root domain. (call it example.com)

I have buddypress installed and setup on blog 2 (call it social.example.com) using this constant define( 'BP_ROOT_BLOG', 2 );

When a site is created with a group the subdomains are being set incorrectly as below:
Created site: test.social.example.com
Instead of: test.example.com

How can i correct this?

Also is there a way to have the site automatically created rather than adding fields to the create group process?

Sofia xXx

https://wordpress.org/plugins/bp-groupblog/