Fixes for Payment information (plan dates)