Some build updates and moving some code out of gc_dialer.py