Work arounds for scaling related issues
[melted] / ChangeLog