Timer bug fixes

Added bug fixes for the broken connection timer