fixed redef warnings