fixing strict violations (still have redefines)