misc fixeS