Some technical issues fixed