Fixes before merging to current git tree.