Small fixes to align with broadsoft and performance inhancements