fix some compliant issues