misc fixs