Fixing 2 places where variables aren't padded