Lock fixes.
Width/height fixing.