Some padding fixes here and there