Fixing INITIALIZED macro
Improving join()