Parsing fixes
Locking