Changes to make compilation work.