SEP2 Fixing some integration problems from voice branch