Corpnet/B2B related modifications, style and bug fixes