Minor fixes
Merge /tmp/cleaned