Fixes for unintentionally modified padding values