Fix review comments. Avoid pixel shift.