Sub Blog issue in BussyPress - Admin Bar link in subblog and new blog creates sub or sub blog

I have BP installed on WPMU and I believe these two issues may be related.

In the admin bar within a sub blog:

- My Blog-->Create Blog ends up creating a blog within a subblog ( site.site.mainsiteurl.com). Acceptable behavior would be all new blogs are created in main blog URL

- Menu Bar-->siteurl.com links to subblog URL (site.mainsiteurl.com

Thanks for your help