Polish paddings and minor tweaks