fixed warningngs