Padding and credits fix