fixed strict standard issues