Fix a few issues
Join to timer thread