vaious fixes