Ben: some padding improvements