Fixed warnings + width issue