Fix marshal bug, and remove Mutex lock