Some tax fixes