fixes to be compilable.