Little fixes and padding