Fix macro
Correct return vals on lock