more tax form fixes