fixed zealous warnings