Sort out padding issues