Use ms syntax everywhere
Lock fixes
Version bump