Fixing more padding errors